libxc, tmem: Fix build after fd2e5008c2e0

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c
index e5268813c6f32c356fc7f2a36da8300a30352ecb..199cc97fd5f98af1e9c81e54ddb0db6691f3fa52 100644 (file)
--- a/tools/libxc/xc_tmem.c
+++ b/tools/libxc/xc_tmem.c
@@ -81,7 +81,7 @@ int xc_tmem_control(xc_interface *xch,
         memset(buf, 0, arg1);
 #endif
 
-    rc = do_tmem_op(xc, &op);
+    rc = do_tmem_op(xch, &op);
 
     if (subop == TMEMC_LIST) {
         if (arg1 != 0)
@@ -91,7 +91,7 @@ int xc_tmem_control(xc_interface *xch,
     return rc;
 }
 
-int xc_tmem_control_oid(int xc,
+int xc_tmem_control_oid(xc_interface *xch,
                         int32_t pool_id,
                         uint32_t subop,
                         uint32_t cli_id,
@@ -463,7 +463,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd)
             if ( read_exact(io_fd, buf, pagesize) )
                 return -1;
             checksum += *buf;
-            if ( (rc = xc_tmem_control_oid(xc, pool_id,
+            if ( (rc = xc_tmem_control_oid(xch, pool_id,
                                            TMEMC_RESTORE_PUT_PAGE, dom,
                                            bufsize, index, oid, buf)) <= 0 )
             {

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index 85869fb0dbfe7ac1cf656d945cbb7260f62f460a..fe665485905461dcd084f2a6c6e77bfaf7b4568f 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -1458,7 +1458,7 @@ struct tmem_oid {
     uint64_t oid[3];
 };
 
-int xc_tmem_control_oid(int xc, int32_t pool_id, uint32_t subop,
+int xc_tmem_control_oid(xc_interface *xch, int32_t pool_id, uint32_t subop,
                         uint32_t cli_id, uint32_t arg1, uint32_t arg2,
                         struct tmem_oid oid, void *buf);
 int xc_tmem_control(xc_interface *xch,